Merge tag 'upstream/2016.10' into debian/master
authorSimon McVittie <smcv@debian.org>
Fri, 9 Sep 2016 15:56:47 +0000 (16:56 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 9 Sep 2016 15:56:47 +0000 (16:56 +0100)
Upstream version 2016.10


Trivial merge